Bugfixes + better url matching