fixed rooms (list and edit); fixed query() and added new escape() method