rename fns to avoid clash + fix query and add remove fn.