DSSSM-368 #time 1h Reviewing the search fields and implementing certain missing search fields