Issue #49 - Adding more info to preprocessed query