Bug fix of query maker when query not has %