merged with upstream
some cleanup
fixed facets cleanup
added orderBy and limit support
Added dist