Fixed displaying of overview
Added filtering