Query fixing..