Minor improvements

Changed whitelist filtering to handle namespaced elements, fixed a
syntax error (forgot a comma)