Added the return period and base period options.

* the options exist but the queries are not ready yet.
Merge branch 'rp_selector'