Added more validation checks.
More validation checks and this time mainly for Current listings.