Better effective substring query idea?