Include favicon and better resource lookup handling