Fix implicit conversion issues for queries

Uncategorized

Performance improvement.