cleanup
update citekey wherestring block + working citekey query