added filter and fixed xpath;