FINALLY fix query, at least category