Alter service to provide more custom method. Fix menu links are filtered.