some policy refactoring; started to work on find policies