active hash refactoring - query resource done