Honor "usedOnly" flag and bugfixes in option retrieval.