Filtering methods

Refactor API methods to filter out results
Optimization/code cleanup