Feature/endpoints filtering + merge with Nelmio master branch