Refactor RF Instance Query