Refactoring - remove appendQuery()