refactored favicon catch