Slightly modified init_query method in query loading concern.