Refactor, crazy fast indexed queries