fix month&week criteria, small fixes + lookupper fields
Merge remote-tracking branch 'origin/master'