Improve Code and add Filter

Merged Jose Luis Zanotti requested to merge JS166-Add_Custom_domain into 7.0-stage

Merge request reports