Add query length limitation