Added additional filters to navigation, added id to navigation attributes, current page is automatically set now