Fixes towards CRM-12490, performance improvements, adherence to options settings