Refactored non TableView activities, extended classes from QueryActivity accordingly