Merge pull request #718 from Tendrid/develop

updates
scrub rebuilds olap cache after deleting frames
Merge pull request #719 from demaagdk/develop

scrub rebuilds olap cache after deleting frames
sort order by params