nested mapping for actions
Merge branch 'actions-mapping' into user-status
used nested queries on the actions
Merge branch 'user-status' into s-hist
some perfomance optimizations