refactor quering part, simplify standard queries creation