adaptions
even more filtering fixes + metric display & added goal column in metrics