Fixed references to download version. Now uses filtering and property