Fix query (erroneously had like); Better formatting