copied remove dollars from diggerdb
fixed bugs with attr selector