Various fixes in hop and path filtering