Completed Custom queries section