Fix return type of select and value/attribute finders