clean up
typos
fixed wrong fluent validation in Query::applyQuery