Fixed filter function and cleaned up no results message