Fix places query, test WIP