added proper URL filtering (no more erros in console) and some todos