Fixes handler
Fix get_handler_by_filename