Added better fix for getting the value instead of from the raw html.

This should be a little more reliable.  And doesn't interfere with the placeholder, if there is one.