WIP: Bugfix/collect invalid uci default

Ups with previous cleanup and rewrite I fucked it up so this is fix for that. The problem was in missing quotation marks and here and there in typo.