Bugfixes
Added some id stuff to the match list