Added find/remove queries