Reverting to custom query with tiles