Fixed a weired issue in querry for non empty string