Implemented additional cache layer
Added wait-indicator
Fixed filter handling