Simplified filtering and showing not found message