Fixed create and find queries. Probably some other broken stuff there...