Address #11 by splitting queries on x value, not cartodb_id

Updates functions and tests