Implemented initial improvements to database query registration