Gh 997

Tested locally and added selenium test, ready to merge.
**Note: migration required.**