Fixed wave view rendering; added validation